Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 22:46:02 +0000 (22:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 22:46:02 +0000 (22:46 +0000)
commit06aee89169a4a69c985157789f38e67bae95cf8e
tree79ba9e30d9f495799f29f7cc3b0a09eff20da1f7
parentb679b944035e654272ad0964a607f011a0075b80
parentf461b52195b14d75c7d791237752c06b146819db
Merge from mainline.